Clean up includes

diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index f86c4b47bff8b2b3bea1860863b8fed4acf5ea69..faf9901650abc4efec2ba7e481e3f175d84f6018 100644 (file)
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -31,9 +31,6 @@
 #include "gtkmarshalers.h"
 #include "gtkmain.h"
 #include "gtkwindow.h"
-#include "gtkcheckmenuitem.h"
-#include "gtkseparatormenuitem.h"
-#include "gtkmenu.h"
 
 #include <gdk/gdk.h>
 #ifdef GDK_WINDOWING_X11

diff --git a/gtk/gtkapplication.h b/gtk/gtkapplication.h
index e1d189fc4ea2126a94b57ef6befe3b9b7d5f1ced..785afac62584039ce9c0557711cd5732bd69e3ce 100644 (file)
--- a/gtk/gtkapplication.h
+++ b/gtk/gtkapplication.h
@@ -27,7 +27,6 @@
 #define __GTK_APPLICATION_H__
 
 #include <gtk/gtkwidget.h>
-#include <gtk/gtkmenu.h>
 #include <gio/gio.h>
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkmodelmenu.c b/gtk/gtkmodelmenu.c
index 0d42bd60b4d2d426070e5deeb928f48c9a572c05..a9979cd03138554b57be9c0cce9957c8b7ffdb92 100644 (file)
--- a/gtk/gtkmodelmenu.c
+++ b/gtk/gtkmodelmenu.c
@@ -25,6 +25,8 @@
 
 #include "gtkmodelmenu.h"
 
+#include "gtkmenu.h"
+#include "gtkmenubar.h"
 #include "gtkseparatormenuitem.h"
 #include "gtkmodelmenuitem.h"
 

diff --git a/gtk/gtkmodelmenu.h b/gtk/gtkmodelmenu.h
index 5a9d7112b01f95f16363578c86ec899919bafd0d..409d1f931679e282326c5fbeaff1079d232def87 100644 (file)
--- a/gtk/gtkmodelmenu.h
+++ b/gtk/gtkmodelmenu.h
@@ -23,8 +23,8 @@
 #define __GTK_MODEL_MENU_H__
 
 #include <gtk/gactionobservable.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkmenu.h>
+#include <gtk/gtkmenushell.h>
+#include <gio/gio.h>
 
 G_GNUC_INTERNAL
 void                    gtk_model_menu_bind                             (GtkMenuShell      *shell,